From: Joakim Verona <joakim@verona.se>
Date: Tue, 27 Aug 2013 16:12:47 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9d6363e6a7ca3d8c89d8e1e92500793a56e749e6;p=emacs.git

merge from trunk
---

9d6363e6a7ca3d8c89d8e1e92500793a56e749e6